Warn if a UTF8_STRING or text/plain;charset=utf-8 roperty contains invalid

Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkselection.c (selection_get_text_plain):
	* gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
	or text/plain;charset=utf-8 roperty contains invalid
	UTF-8.  (#152845, Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index 18175473e527051e166c0138ed237e05a6bcd702..fbb87839fcf021910e789abcc08c576471e43a3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkselection.c (selection_get_text_plain): 
+       * gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
+       or text/plain;charset=utf-8 roperty contains invalid 
+       UTF-8.  (#152845, Owen Taylor)
+
 2004-09-16  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #152760, Christian Persch:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 18175473e527051e166c0138ed237e05a6bcd702..fbb87839fcf021910e789abcc08c576471e43a3b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkselection.c (selection_get_text_plain): 
+       * gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
+       or text/plain;charset=utf-8 roperty contains invalid 
+       UTF-8.  (#152845, Owen Taylor)
+
 2004-09-16  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #152760, Christian Persch:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 18175473e527051e166c0138ed237e05a6bcd702..fbb87839fcf021910e789abcc08c576471e43a3b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkselection.c (selection_get_text_plain): 
+       * gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
+       or text/plain;charset=utf-8 roperty contains invalid 
+       UTF-8.  (#152845, Owen Taylor)
+
 2004-09-16  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #152760, Christian Persch:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 18175473e527051e166c0138ed237e05a6bcd702..fbb87839fcf021910e789abcc08c576471e43a3b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Thu Sep 16 23:20:05 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkselection.c (selection_get_text_plain): 
+       * gdk/x11/gdkselection-x11.c (make_list): Warn if a UTF8_STRING
+       or text/plain;charset=utf-8 roperty contains invalid 
+       UTF-8.  (#152845, Owen Taylor)
+
 2004-09-16  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #152760, Christian Persch:

diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index ef079dee22f9e9f5b94c074d98be7a6ee58b6fd5..13aca15ceaa2f69fdc3f3f7c5ecd5a7aa96cb8d0 100644 (file)
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -516,7 +516,15 @@ make_list (const gchar  *text,
            }
        }
       else
-       str = g_strndup (p, q - p);
+       {
+         str = g_strndup (p, q - p);
+         if (!g_utf8_validate (str, -1, NULL))
+           {
+             g_warning ("Error converting selection from UTF8_STRING");
+             g_free (str);
+             str = NULL;
+           }
+       }
 
       if (str)
        {

diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index d0ec8b8bc863646089dd46d8b4e74a33181414c7..e9fab860148797b43e603b0d1bd7c1a7a3cea8db 100644 (file)
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1032,20 +1032,25 @@ selection_get_text_plain (GtkSelectionData *selection_data)
                                     charset, "UTF-8", 
                                     NULL, NULL, &len, &error);
       g_free (tmp);
-    }
 
-  if (!str)
+      if (!str)
+       {
+         g_warning ("Error converting from %s to UTF-8: %s",
+                     charset, error->message);
+         g_error_free (error);
+
+         return NULL;
+       }
+    }
+  else if (!g_utf8_validate (str, -1, NULL))
     {
-      g_warning ("Error converting from %s to UTF-8: %s",
-                charset, error->message);
-      g_error_free (error);
-      
+      g_warning ("Error converting from text/plain;charset=utf-8 to UTF-8");
+      g_free (str);
+
       return NULL;
     }
 
-
   result = normalize_to_lf (str, len);
-
   g_free (str);
 
   return result;